lib: Drop GFiles for self->{objects_dir,state_dir}

Everything that used to reference these is now fd-relative.

Closes: #432
Approved by: giuseppe

diff --git a/src/libostree/ostree-repo-private.h b/src/libostree/ostree-repo-private.h
index 917a9dae8b620ac8871ef47205686e7f2dc2f6cb..e20e74555166b173f0ec4d551ac746999b8e1f05 100644 (file)
--- a/src/libostree/ostree-repo-private.h
+++ b/src/libostree/ostree-repo-private.h
@@ -73,8 +73,6 @@ struct OstreeRepo {
   int    tmp_dir_fd;
   int    cache_dir_fd;
   char  *cache_dir;
-  GFile *objects_dir;
-  GFile *state_dir;
   int objects_dir_fd;
   GFile *deltas_dir;
   GFile *uncompressed_objects_dir;

diff --git a/src/libostree/ostree-repo.c b/src/libostree/ostree-repo.c
index 675e1cacd3aeaad917daebf5ddb0877be936d6d2..e9966b5f0714a4a021ecef3f35c8c25bbaa788f5 100644 (file)
--- a/src/libostree/ostree-repo.c
+++ b/src/libostree/ostree-repo.c
@@ -520,11 +520,9 @@ ostree_repo_finalize (GObject *object)
     (void) close (self->tmp_dir_fd);
   if (self->cache_dir_fd)
     (void) close (self->cache_dir_fd);
-  g_clear_object (&self->objects_dir);
   if (self->objects_dir_fd != -1)
     (void) close (self->objects_dir_fd);
   g_clear_object (&self->deltas_dir);
-  g_clear_object (&self->state_dir);
   g_clear_object (&self->uncompressed_objects_dir);
   if (self->uncompressed_objects_dir_fd != -1)
     (void) close (self->uncompressed_objects_dir_fd);
@@ -613,10 +611,8 @@ ostree_repo_constructed (GObject *object)
 
   self->tmp_dir = g_file_resolve_relative_path (self->repodir, "tmp");
 
-  self->objects_dir = g_file_get_child (self->repodir, "objects");
   self->deltas_dir = g_file_get_child (self->repodir, "deltas");
   self->uncompressed_objects_dir = g_file_get_child (self->repodir, "uncompressed-objects-cache");
-  self->state_dir = g_file_get_child (self->repodir, "state");
   self->config_file = g_file_get_child (self->repodir, "config");
 
   /* Ensure the "sysroot-path" property is set. */